eliminated superflous code