Deprecated API cleanup