Upgrade versions, remove unused packages

+ align text for better readability