Removed some ember references