Removed some nasty dependencies that hopefully won't be needed.