181 code clean up