imports organized
fix of unused code