Remove unused type.
Enable automatic package restore and minor refactoring.