Removed CRUD API, cleaned up comments