Removed that expando stuff
Removed TODO.md (use Github issues instead)