cleaning up
Finally fixed the stupid dependencies!