fixed imports
updated some utils
Merge branch 'clean-up'