disable a couple of kludges that are no longer required