cleaned up some FXCOP/OACR stuff