add needed executor import
rm unused types