remove debug code
add dependencies