Remove useless code and comments