clean up vestigial code from certain octopus parser modules, moving the remainder into the main module