Some Obectify cleanup