Revert the opm user stuff.

This will need to be investigated further.
Merge branch 'feature/revert-opm-user' into develop
Fix args not being passed to the init function.
Merge branch 'bugfix/args-not-being-passed-to-init' into develop