fixed imports
remove unused code
refactory