Revert "Cleaning up."

This reverts commit 602e156003041bcd4c7c0f8e08a4114765ac614b.