Revert "Clean up"

This reverts commit b5b56ab66534f00d2f4ffd94a0d6383ef8e6d225.