cleaned up superflous stuff