General clean up of the otapackage