Cleanup imports in some files.
Remove unused actions.