Remove API specific code