Removed more cruft from 2