Move vendor loading into vendor
Remove unused alias