Removing not tested lines and not needed lines