Revert "cleanup"

This reverts commit 40bd15e85be7ba136c2a6fb8d15666df966f02ee.
Working update