removed superflous stuff