Upgraded ember
Cleanup