Removed unnecessary behavior / tests.