clean ups to prior to gemification