Revert "intial cleanup"

This reverts commit e7387f38159ac5c1df128b42a211119e2a704ba6.