Remove an unnecessary phase, and some unnecessary deps