feature-24: clean up gem