Revert "Clean up"

This reverts commit 7d68dd57bbf1953f5db2bf448aa14477c74ef0bd.