surgically removed unecessary code