Refactor - another vec gone