Fix dependencies and clean