Removed some TODOs that were done already