bumping ember, cleaning up model cleanup