Tidied up imports, removed m2e warnings about internal plugin.