Removed a bunch of @todo comments