remove import folder references, clean up code