Took out redundant code