Removed top comments and some extra cruft