Added TODOs and removed some cruft