Got rid of all the ember stuff