code cleanup

Removed up unneeded code. Set new TODOs for tomorrow.