remove import *
remove unused step and functions