Cleaned up WPCF7 Overrides