cleanup + missing .net methods