Cleaned up TODOs