Project cleanup, remove some deprecated 1.4.x stuff