consistency between ember version
tidy up