removed superflous code