1.5 API cleanup