remove unnecessary code and comment