Simple deadcode elimination
some changes
Comments