Removed todos since they were done