Revert "Clean up"

This reverts commit 6074e4959a9ae0cb70189840d7c7973746c7091e.