CDB-2939 further cleaning and setup