remove unnecessary codes that comment out