Removing debugging and using an older emulator to try and speed things along