remove old stuff and small fixes