Actually remove old code