clean up in line with commit