uneeded codes removed