Massive API cleanup