Fixed dependencies and removed unused ones