New gem versions, some cleanup