Revert "Revert "Revert "Clean. Start Here."""

This reverts commit af60059faaf18811ff3b6e38e3573bacecbd843d.