Revert "Revert "Clean. Start Here.""

This reverts commit f96167fb3352e20ce694d55dd02c92bf4b44c764.