Removed some old code, added todo's.