cleanup requires
remove unused code
get npm test working