Removed superfluous (disabled) code