remove useless utils
fix tests and routes (#6)