Refactoring done but doesn't work; vector problem?
Remove an old comment