Removed a few dependencies...