Removed more obsoletge cruft