more refactor
remove old stuff
refactor and cleanups