Cleanup for VS only project