Cleaning up

Preparing for .NET master files