move removeApis, fix a few issues
move more removeApis, fix issues