removed possible redundant code