Reorder setup todos.
Cleanup for Yosemite.