minor improv, remove old stuff