Removed more unwanted draft code.