Removed superflous stuff