Removing some useless lines from