Fix additional issues with user build projects
Remove unused class and enum