minor removal of deprecated stuff