clean up

clean up unused plugin
switch to submodule
continue clean up