Switching back to ember, start cleaning things up again.