Clean up ember code