Still some stray obsolete code