remove some non-needed code