Clean up repository in preperation for new EmulatorAPI