more cleanup

- simplified urls
- removed utility classes that simply held url paths