Fix a couple naming conflicts causing linker errors when building for simulator
Remove Framework