Remove TODOs since I actually implemented them