Finish getting rid of statichere/staticforward