Remove some unnecessary enumerables (since they don't particularly need to be just enumerables as it is)