fix some formatting, remove old stuff