Small redundant code removals