Continual Removing of old code