Remove even more obsolete stuff