Cleanup code, fall .net to minimal (2.0)