removed the BATH_TYPE references