Cleanup. Still leaving TODO notes