more reorganizing
remove old stuff