Change to canonical version and optimize dependencies