Revert "Cleanup"

This reverts commit a2030f84c501df3cb8299cf79f1505118c2570c9.