cleaning up legacy gems