tidy up from VS Project conversion