More old code removed