Continued to remove old code.