remove some temporary fixes