remove deprecated stuff for 1.4