Removed & replaced superflous code.