cleanup from b-dev-ce