Removed a mistaken dependency, cleaned up code a bit more.