fix type. remove commented code