more express cleanup