removed the redundant code