[OTHER] further cleanup