[#ATBL-33] clean up