Clean up code touching API