Evol - first cleanup