clean up
fix sb issue