Remove old ember crutch