Removed unnecessary branching/conditions.