Remove submodule and make plugin provide convenience functions instead of acting as a wrapper