Updated contrib modules
Removed depedencies on countries module