Cleanup api and comments