remove old stuff
updated
update comments