HV-907 Fixing unwanted generated classes after build