Revert "Clean Up, Clean Up"

This reverts commit f3bc8e13de72c9e5b1017ec96065d51079d78485.