VS project cleaned up