Revert "some new stuff and TODOs for u"

This reverts commit 42d0b12a0ed8c2e379d7614598e139d66d77f802.
ups.. :D