.NETification
Clean up