Remove ruby versions
Split out includes