Re-organise and delete .deps file (they're all killed in 1.21)