remove unused
add paths in utils and update test