Removing redundant code already