Schema Writing - API Cleaning