Revert "Clean up"

This reverts commit 4af645888697a02daa545a5079ce1de4b9acede7.