jenkins test / code clean up