unnecessary codes removed