fix and clean dependencies