Upgrade gems and cleanup