removing redundant code.