fix new Xcode issue; remove removeControl