cleaned up some leftovers