Fixed file menu ordering.
Removed some more cruft.