All tests now working. Removed most redundant code.
All tests now working. Removed most redundant code.

johnswanson/re-com,samroberton/re-com,StephenCharles/re-com,KeeganMyers/re-com,Day8/re-com,ducky427/re-com,osbert/re-com