Cleanup + Complete API implementation