Removed Some Cruft