OA+ fixes; changes in pig scripts; obsolute code removal

* OA+ fixes
* changes in pig scripts
* obsolute code removal