HOPKINS: Some more similar cleanup