There is a sentence in an exercise in the Speed Master N4 book:
[引越しします]までにいらないものを捨てておいた方がいいですよ。
The expression in brackets should be put in the correct form. The keys state that the correct form is 引越しする. Can する be dropped? Or does Nまで(に)works only when N is an expression of time?