Removed TODOs, misc cleanup