removed garbage
refactor # 1
refactor still in progress...