Remove/optimize extension methods