Clean up imports (taken from PR #1804)

I noticed you did this for the raw action_plugin already, we might do the same for the others as well.