cleaned up the wp defaults forms