Revert "cleanup and work"

This reverts commit e31cefabe8d70f89613fe5228adef06891ff909a.