some minor cleanup of leftovers