API changes & Cleanup