COSMIT: minor cleanup