More unused gems removal