cleanup per discussions with rax