Started removing redundant code