Removed most of old cruft