Cleanup and update gems