b.1 code clean up