Removed superflous code