and even more ember 1.4 cleanup