diff --git a/connector-rest-wordpress/connector-rest-wordpress.tar.2019-02-17 b/connector-rest-wordpress/connector-rest-wordpress.tar.2019-02-17
deleted file mode 100644
index 52808f8..0000000
Binary files a/connector-rest-wordpress/connector-rest-wordpress.tar.2019-02-17 and /dev/null differ
diff --git a/connector-rest-wordpress/connector-rest-wordpress.tar.2019-03-13 b/connector-rest-wordpress/connector-rest-wordpress.tar.2019-03-13
deleted file mode 100644
index dc91335..0000000
Binary files a/connector-rest-wordpress/connector-rest-wordpress.tar.2019-03-13 and /dev/null differ
diff --git a/connector-rest-wordpress/samples/backup/connector-rest-wordpress.xml b/connector-rest-wordpress/samples/backup/connector-rest-wordpress.xml
deleted file mode 100644
index df69886..0000000
--- a/connector-rest-wordpress/samples/backup/connector-rest-wordpress.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<resource xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" oid="69759117-094f-4c2a-af96-e38233476148" version="12">
-    <name>wordpress10</name>
-    <metadata>
-        <modifyTimestamp>2019-02-27T14:37:46.148Z</modifyTimestamp>
-        <modifierRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <modifyChannel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</modifyChannel>
-    </metadata>
-    <operationExecution id="1">
-        <timestamp>2019-02-27T14:37:38.675Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000171</token>
-            </executionResult>
-            <objectName>wordpress10</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationExecution id="2">
-        <timestamp>2019-02-27T14:37:42.502Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000235</token>
-            </executionResult>
-            <objectName>wordpress10</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationExecution id="3">
-        <timestamp>2019-02-27T14:37:44.010Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000276</token>
-            </executionResult>
-            <objectName>wordpress10</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationExecution id="4">
-        <timestamp>2019-02-27T14:37:46.247Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000317</token>
-            </executionResult>
-            <objectName>wordpress10</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationalState>
-        <lastAvailabilityStatus>up</lastAvailabilityStatus>
-    </operationalState>
-
-    <connectorRef type="c:ConnectorType">
-     <filter>
-                                <q:equal>
-                                        <q:path>c:connectorType</q:path>
-                                        <q:value>edu.unc.polygon.connector.wordpress.WordpressRestConnector</q:value>
-                                </q:equal>
-                        </filter>
-                </connectorRef>
-
-    <connectorConfiguration xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3">
-        <icfc:configurationProperties xmlns:gen797="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/edu.unc.polygon.connector-rest-wordpress/edu.unc.polygon.connector.wordpress.WordpressRestConnector">
-            <gen797:wordpressPassword>54y6RxN7GfC7aes3</gen797:wordpressPassword>
-            <gen797:wordpressUniqueAttribute>id</gen797:wordpressUniqueAttribute>
-            <gen797:wordpressRestUrl>http://wordpress_server/wp-json</gen797:wordpressRestUrl>
-            <gen797:wordpressPasswordAttribute>password</gen797:wordpressPasswordAttribute>
-            <gen797:wordpressNameAttribute>username</gen797:wordpressNameAttribute>
-            <gen797:wordpressUsername>admin</gen797:wordpressUsername>
-        </icfc:configurationProperties>
-    </connectorConfiguration>
-    <schema>
-        <cachingMetadata>
-            <retrievalTimestamp>2019-02-27T14:37:38.881Z</retrievalTimestamp>
-            <serialNumber>eabcca0492d13af9-cb61678d74c86efd</serialNumber>
-        </cachingMetadata>
-        <definition>
-            <xsd:schema xmlns:a="http://prism.evolveum.com/xml/ns/public/annotation-3" xmlns:ra="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3" xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
-                <xsd:import namespace="http://prism.evolveum.com/xml/ns/public/annotation-3"/>
-                <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"/>
-                <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3"/>
-                <xsd:complexType name="MESSAGE_OBJECT_CLASS___ACCOUNT__">
-                    <xsd:annotation>
-                        <xsd:appinfo>
-                            <ra:resourceObject/>
-                            <ra:identifier>icfs:uid</ra:identifier>
-                            <ra:secondaryIdentifier>icfs:name</ra:secondaryIdentifier>
-                            <ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
-                            <ra:namingAttribute>icfs:name</ra:namingAttribute>
-                            <ra:nativeObjectClass>MESSAGE_OBJECT_CLASS___ACCOUNT__</ra:nativeObjectClass>
-                        </xsd:appinfo>
-                    </xsd:annotation>
-                    <xsd:sequence>
-                        <xsd:element minOccurs="0" name="password" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>120</a:displayOrder>
-                                    <ra:frameworkAttributeName>password</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" name="username" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>130</a:displayOrder>
-                                    <ra:frameworkAttributeName>username</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element ref="icfs:name">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayName>ConnId Name</a:displayName>
-                                    <a:displayOrder>110</a:displayOrder>
-                                    <ra:frameworkAttributeName>__NAME__</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" name="id" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>140</a:displayOrder>
-                                    <ra:frameworkAttributeName>id</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" name="email" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>150</a:displayOrder>
-                                    <ra:frameworkAttributeName>email</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        
-                        <xsd:element minOccurs="0" ref="icfs:uid">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayName>ConnId UID</a:displayName>
-                                    <a:displayOrder>100</a:displayOrder>
-                                    <a:access>read</a:access>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:schema>
-        </definition>
-    </schema>
-    <schemaHandling>
-        <objectType id="7">
-            <kind>account</kind>
-            <intent>default</intent>
-            <default>true</default>
-            <objectClass>ri:MESSAGE_OBJECT_CLASS___ACCOUNT__</objectClass>
-            <attribute id="8">
-                <c:ref>ri:username</c:ref>
-                <outbound>
-                    <source>
-                        <c:path>$user/name</c:path>
-                    </source>
-                </outbound>
-            </attribute>
-            <attribute id="9">
-                <c:ref>ri:email</c:ref>
-                <outbound>
-                    <source>
-                        <c:path>$user/emailAddress</c:path>
-                    </source>
-                </outbound>
-            </attribute>
-            <attribute id="11">
-                <c:ref>icfs:name</c:ref>
-                <outbound>
-                    <source>
-                        <c:path>$user/name</c:path>
-                    </source>
-                </outbound>
-            </attribute>
-            <credentials>
-                <password xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:ResourcePasswordDefinitionType">
-                    <outbound/>
-                </password>
-            </credentials>
-        </objectType>
-    </schemaHandling>
-    <capabilities>
-        <cachingMetadata>
-            <retrievalTimestamp>2019-02-27T14:37:38.876Z</retrievalTimestamp>
-            <serialNumber>dec8f19649257694-abba027d4eec515</serialNumber>
-        </cachingMetadata>
-        <native xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:CapabilityCollectionType">
-            <cap:schema/>
-            <cap:testConnection/>
-            <cap:create/>
-            <cap:update/>
-            <cap:delete/>
-            <cap:script>
-                <cap:host>
-                    <cap:type>connector</cap:type>
-                </cap:host>
-            </cap:script>
-            <cap:addRemoveAttributeValues/>
-        </native>
-        <configured xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:CapabilityCollectionType">
-            <cap:testConnection>
-                <cap:enabled>true</cap:enabled>
-            </cap:testConnection>
-            <cap:create>
-                <cap:enabled>true</cap:enabled>
-            </cap:create>
-            <cap:update>
-                <cap:enabled>true</cap:enabled>
-            </cap:update>
-            <cap:delete>
-                <cap:enabled>true</cap:enabled>
-            </cap:delete>
-            <cap:script>
-                <cap:enabled>true</cap:enabled>
-                <cap:host>
-                    <cap:type>connector</cap:type>
-                </cap:host>
-            </cap:script>
-            <cap:addRemoveAttributeValues>
-                <cap:enabled>true</cap:enabled>
-            </cap:addRemoveAttributeValues>
-        </configured>
-    </capabilities>
-    <synchronization/>
-</resource>
-
diff --git a/connector-rest-wordpress/samples/connector-rest-wordpress.xml.2019-03-22 b/connector-rest-wordpress/samples/connector-rest-wordpress.xml.2019-03-22
deleted file mode 100644
index 0c108da..0000000
--- a/connector-rest-wordpress/samples/connector-rest-wordpress.xml.2019-03-22
+++ /dev/null
@@ -1,308 +0,0 @@
-<resource xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" oid="dc317e79-c961-463e-b366-f7fc4ca6010e" version="10">
-    <name>wordpress11</name>
-    <metadata>
-        <modifyTimestamp>2019-02-27T17:34:59.709Z</modifyTimestamp>
-        <modifierRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <modifyChannel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</modifyChannel>
-    </metadata>
-    <operationExecution id="1">
-        <timestamp>2019-02-27T17:34:51.716Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000180</token>
-            </executionResult>
-            <objectName>wordpress11</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationExecution id="2">
-        <timestamp>2019-02-27T17:34:55.774Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000244</token>
-            </executionResult>
-            <objectName>wordpress11</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationExecution id="3">
-        <timestamp>2019-02-27T17:34:57.295Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000285</token>
-            </executionResult>
-            <objectName>wordpress11</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationExecution id="4">
-        <timestamp>2019-02-27T17:34:59.819Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000326</token>
-            </executionResult>
-            <objectName>wordpress11</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationalState>
-        <lastAvailabilityStatus>up</lastAvailabilityStatus>
-    </operationalState>
-    <connectorRef oid="7e2d5a24-a09f-473d-acf7-9fc377eb1960" relation="org:default" type="c:ConnectorType"/>
-    <connectorConfiguration xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3">
-        <icfc:configurationProperties xmlns:gen683="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/edu.unc.polygon.connector-rest-wordpress/edu.unc.polygon.connector.wordpress.WordpressRestConnector">
-            <gen683:wordpressPassword>54y6RxN7GfC7aes3</gen683:wordpressPassword>
-            <gen683:wordpressUniqueAttribute>id</gen683:wordpressUniqueAttribute>
-            <gen683:wordpressRestUrl>http://wordpress_server/wp-json</gen683:wordpressRestUrl>
-            <gen683:wordpressPasswordAttribute>password</gen683:wordpressPasswordAttribute>
-            <gen683:wordpressNameAttribute>username</gen683:wordpressNameAttribute>
-            <gen683:wordpressUsername>admin</gen683:wordpressUsername>
-        </icfc:configurationProperties>
-    </connectorConfiguration>
-    <schema>
-        <cachingMetadata>
-            <retrievalTimestamp>2019-02-27T17:34:51.956Z</retrievalTimestamp>
-            <serialNumber>a2cdf44895930342-82281c17d5e27924</serialNumber>
-        </cachingMetadata>
-        <definition>
-            <xsd:schema xmlns:a="http://prism.evolveum.com/xml/ns/public/annotation-3" xmlns:ra="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3" xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
-                <xsd:import namespace="http://prism.evolveum.com/xml/ns/public/annotation-3"/>
-                <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"/>
-                <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3"/>
-                <xsd:complexType name="MESSAGE_OBJECT_CLASS___ACCOUNT__">
-                    <xsd:annotation>
-                        <xsd:appinfo>
-                            <ra:resourceObject/>
-                            <ra:identifier>icfs:uid</ra:identifier>
-                            <ra:secondaryIdentifier>icfs:name</ra:secondaryIdentifier>
-                            <ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
-                            <ra:namingAttribute>icfs:name</ra:namingAttribute>
-                            <ra:nativeObjectClass>MESSAGE_OBJECT_CLASS___ACCOUNT__</ra:nativeObjectClass>
-                        </xsd:appinfo>
-                    </xsd:annotation>
-                    <xsd:sequence>
-                        <xsd:element minOccurs="0" name="password" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>120</a:displayOrder>
-                                    <ra:frameworkAttributeName>password</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element maxOccurs="unbounded" minOccurs="0" name="roles" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>130</a:displayOrder>
-                                    <ra:frameworkAttributeName>roles</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" name="username" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>140</a:displayOrder>
-                                    <ra:frameworkAttributeName>username</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element ref="icfs:name">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayName>ConnId Name</a:displayName>
-                                    <a:displayOrder>110</a:displayOrder>
-                                    <ra:frameworkAttributeName>__NAME__</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" name="id" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>150</a:displayOrder>
-                                    <ra:frameworkAttributeName>id</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" name="last_name" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>160</a:displayOrder>
-                                    <ra:frameworkAttributeName>last_name</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" name="email" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>170</a:displayOrder>
-                                    <ra:frameworkAttributeName>email</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" name="first_name" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>180</a:displayOrder>
-                                    <ra:frameworkAttributeName>first_name</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" name="name" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>190</a:displayOrder>
-                                    <ra:frameworkAttributeName>name</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" ref="icfs:uid">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayName>ConnId UID</a:displayName>
-                                    <a:displayOrder>100</a:displayOrder>
-                                    <a:access>read</a:access>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:schema>
-        </definition>
-    </schema>
-    <schemaHandling>
-        <objectType id="7">
-            <kind>account</kind>
-            <intent>default</intent>
-            <default>true</default>
-            <objectClass>ri:MESSAGE_OBJECT_CLASS___ACCOUNT__</objectClass>
-            <attribute id="1">
-                <c:ref>ri:username</c:ref>
-                <outbound>
-                    <source>
-                        <c:path>$user/name</c:path>
-                    </source>
-                </outbound>
-            </attribute>
-            <attribute id="2">
-                <c:ref>ri:email</c:ref>
-                <outbound>
-                    <source>
-                        <c:path>$user/emailAddress</c:path>
-                    </source>
-                </outbound>
-            </attribute>
-            <attribute id="3">
-                <c:ref>ri:name</c:ref>
-                <outbound>
-                    <source>
-                        <c:path>$user/fullName</c:path>
-                    </source>
-                </outbound>
-            </attribute>
-            <attribute id="4">
-                <c:ref>ri:first_name</c:ref>
-                <outbound>
-                    <source>
-                        <c:path>$user/givenName</c:path>
-                    </source>
-                </outbound>
-            </attribute>
-            <attribute id="5">
-                <c:ref>ri:last_name</c:ref>
-                <outbound>
-                    <source>
-                        <c:path>$user/familyName</c:path>
-                    </source>
-                </outbound>
-            </attribute>
-            <attribute id="6">
-                <c:ref>icfs:name</c:ref>
-                <outbound>
-                    <source>
-                        <c:path>$user/name</c:path>
-                    </source>
-                </outbound>
-            </attribute>
-            <credentials>
-                <password xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:ResourcePasswordDefinitionType">
-                    <outbound/>
-                </password>
-            </credentials>
-        </objectType>
-    </schemaHandling>
-    <capabilities>
-        <cachingMetadata>
-            <retrievalTimestamp>2019-02-27T17:34:51.950Z</retrievalTimestamp>
-            <serialNumber>b729a58a9e1701d1-b7fa31ba5db845f2</serialNumber>
-        </cachingMetadata>
-        <native xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:CapabilityCollectionType">
-            <cap:schema/>
-            <cap:testConnection/>
-            <cap:create/>
-            <cap:update/>
-            <cap:delete/>
-            <cap:script>
-                <cap:host>
-                    <cap:type>connector</cap:type>
-                </cap:host>
-            </cap:script>
-            <cap:addRemoveAttributeValues/>
-        </native>
-        <configured xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:CapabilityCollectionType">
-            <cap:testConnection>
-                <cap:enabled>true</cap:enabled>
-            </cap:testConnection>
-            <cap:create>
-                <cap:enabled>true</cap:enabled>
-            </cap:create>
-            <cap:update>
-                <cap:enabled>true</cap:enabled>
-            </cap:update>
-            <cap:delete>
-                <cap:enabled>true</cap:enabled>
-            </cap:delete>
-            <cap:script>
-                <cap:enabled>true</cap:enabled>
-                <cap:host>
-                    <cap:type>connector</cap:type>
-                </cap:host>
-            </cap:script>
-            <cap:addRemoveAttributeValues>
-                <cap:enabled>true</cap:enabled>
-            </cap:addRemoveAttributeValues>
-        </configured>
-    </capabilities>
-    <synchronization/>
-</resource>
-
diff --git a/connector-rest-wordpress/samples/connector-rest-wordpress.xml.2019.02-27 b/connector-rest-wordpress/samples/connector-rest-wordpress.xml.2019.02-27
deleted file mode 100644
index ccf6c7b..0000000
--- a/connector-rest-wordpress/samples/connector-rest-wordpress.xml.2019.02-27
+++ /dev/null
@@ -1,262 +0,0 @@
-<resource xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" oid="4ebdf43f-c422-4e07-a094-ecbcd67531ab" version="20">
-    <name>wordpress2</name>
-    <metadata>
-        <modifyTimestamp>2019-02-26T13:47:17.404Z</modifyTimestamp>
-        <modifierRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <modifyChannel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</modifyChannel>
-    </metadata>
-    <operationExecution id="2">
-        <timestamp>2019-02-26T13:46:23.011Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000270</token>
-            </executionResult>
-            <objectName>wordpress2</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationExecution id="3">
-        <timestamp>2019-02-26T13:46:25.508Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000311</token>
-            </executionResult>
-            <objectName>wordpress2</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationExecution id="4">
-        <timestamp>2019-02-26T13:46:29.184Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000352</token>
-            </executionResult>
-            <objectName>wordpress2</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationExecution id="5">
-        <timestamp>2019-02-26T13:46:35.665Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000428</token>
-            </executionResult>
-            <objectName>wordpress2</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationExecution id="6">
-        <timestamp>2019-02-26T13:47:17.462Z</timestamp>
-        <operation>
-            <objectDelta>
-                <t:changeType>modify</t:changeType>
-                <t:objectType>c:ResourceType</t:objectType>
-            </objectDelta>
-            <executionResult>
-                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-                <status>success</status>
-                <token>1000000000000000544</token>
-            </executionResult>
-            <objectName>wordpress2</objectName>
-        </operation>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-    </operationExecution>
-    <operationalState>
-        <lastAvailabilityStatus>up</lastAvailabilityStatus>
-    </operationalState>
-    <connectorRef oid="d41c7b62-5b81-4004-9c00-d56a861da761" relation="org:default" type="c:ConnectorType"/>
-    <connectorConfiguration xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3">
-        <icfc:configurationProperties xmlns:gen183="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/edu.unc.polygon.connector-rest-wordpress/edu.unc.polygon.connector.wordpress.WordpressRestConnector">
-            <gen183:wordpressPassword>54y6RxN7GfC7aes3</gen183:wordpressPassword>
-            <gen183:wordpressUniqueAttribute>id</gen183:wordpressUniqueAttribute>
-            <gen183:wordpressRestUrl>http://wordpress_server/wp-json</gen183:wordpressRestUrl>
-            <gen183:wordpressPasswordAttribute>password</gen183:wordpressPasswordAttribute>
-            <gen183:wordpressNameAttribute>username</gen183:wordpressNameAttribute>
-            <gen183:wordpressUsername>admin</gen183:wordpressUsername>
-        </icfc:configurationProperties>
-    </connectorConfiguration>
-    <schema>
-        <cachingMetadata>
-            <retrievalTimestamp>2019-02-26T13:47:17.687Z</retrievalTimestamp>
-            <serialNumber>3e81caa04edd051e-6991ea285dc7cd37</serialNumber>
-        </cachingMetadata>
-        <definition>
-            <xsd:schema xmlns:a="http://prism.evolveum.com/xml/ns/public/annotation-3" xmlns:ra="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3" xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
-                <xsd:import namespace="http://prism.evolveum.com/xml/ns/public/annotation-3"/>
-                <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"/>
-                <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3"/>
-                <xsd:complexType name="MESSAGE_OBJECT_CLASS___ACCOUNT__">
-                    <xsd:annotation>
-                        <xsd:appinfo>
-                            <ra:resourceObject/>
-                            <ra:identifier>icfs:uid</ra:identifier>
-                            <ra:secondaryIdentifier>icfs:name</ra:secondaryIdentifier>
-                            <ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
-                            <ra:namingAttribute>icfs:name</ra:namingAttribute>
-                            <ra:nativeObjectClass>MESSAGE_OBJECT_CLASS___ACCOUNT__</ra:nativeObjectClass>
-                        </xsd:appinfo>
-                    </xsd:annotation>
-                    <xsd:sequence>
-                        <xsd:element minOccurs="0" name="password" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>120</a:displayOrder>
-                                    <ra:frameworkAttributeName>password</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" name="username" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>130</a:displayOrder>
-                                    <ra:frameworkAttributeName>username</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element ref="icfs:name">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayName>ConnId Name</a:displayName>
-                                    <a:displayOrder>110</a:displayOrder>
-                                    <ra:frameworkAttributeName>__NAME__</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" name="id" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>140</a:displayOrder>
-                                    <ra:frameworkAttributeName>id</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" name="email" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayOrder>150</a:displayOrder>
-                                    <ra:frameworkAttributeName>email</ra:frameworkAttributeName>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element minOccurs="0" ref="icfs:uid">
-                            <xsd:annotation>
-                                <xsd:appinfo>
-                                    <a:displayName>ConnId UID</a:displayName>
-                                    <a:displayOrder>100</a:displayOrder>
-                                    <a:access>read</a:access>
-                                </xsd:appinfo>
-                            </xsd:annotation>
-                        </xsd:element>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:schema>
-        </definition>
-    </schema>
-    <schemaHandling>
-        <objectType id="7">
-            <kind>account</kind>
-            <intent>default</intent>
-            <default>true</default>
-            <objectClass>ri:MESSAGE_OBJECT_CLASS___ACCOUNT__</objectClass>
-            <attribute id="8">
-                <c:ref>ri:username</c:ref>
-                <outbound>
-                    <source>
-                        <c:path>$user/name</c:path>
-                    </source>
-                </outbound>
-            </attribute>
-            <attribute id="9">
-                <c:ref>ri:email</c:ref>
-                <outbound>
-                    <source>
-                        <c:path>$user/emailAddress</c:path>
-                    </source>
-                </outbound>
-            </attribute>
-            <credentials>
-                <password xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:ResourcePasswordDefinitionType">
-                    <outbound/>
-                </password>
-            </credentials>
-        </objectType>
-    </schemaHandling>
-    <capabilities>
-        <cachingMetadata>
-            <retrievalTimestamp>2019-02-26T13:47:17.686Z</retrievalTimestamp>
-            <serialNumber>dba87b27b95a9c73-8527ccc80dac2310</serialNumber>
-        </cachingMetadata>
-        <native xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:CapabilityCollectionType">
-            <cap:schema/>
-            <cap:testConnection/>
-            <cap:create/>
-            <cap:update/>
-            <cap:delete/>
-            <cap:script>
-                <cap:host>
-                    <cap:type>connector</cap:type>
-                </cap:host>
-            </cap:script>
-            <cap:addRemoveAttributeValues/>
-        </native>
-        <configured xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:CapabilityCollectionType">
-            <cap:testConnection>
-                <cap:enabled>true</cap:enabled>
-            </cap:testConnection>
-            <cap:create>
-                <cap:enabled>true</cap:enabled>
-            </cap:create>
-            <cap:update>
-                <cap:enabled>true</cap:enabled>
-            </cap:update>
-            <cap:delete>
-                <cap:enabled>true</cap:enabled>
-            </cap:delete>
-            <cap:script>
-                <cap:enabled>true</cap:enabled>
-                <cap:host>
-                    <cap:type>connector</cap:type>
-                </cap:host>
-            </cap:script>
-            <cap:addRemoveAttributeValues>
-                <cap:enabled>true</cap:enabled>
-            </cap:addRemoveAttributeValues>
-        </configured>
-    </capabilities>
-    <synchronization/>
-</resource>
-
diff --git a/connector-rest-wordpress/src/main/java/edu/unc/polygon/connector/wordpress/WordpressFilterTranslator.java.2019-03-20 b/connector-rest-wordpress/src/main/java/edu/unc/polygon/connector/wordpress/WordpressFilterTranslator.java.2019-03-20
deleted file mode 100644
index efc55e9..0000000
--- a/connector-rest-wordpress/src/main/java/edu/unc/polygon/connector/wordpress/WordpressFilterTranslator.java.2019-03-20
+++ /dev/null
@@ -1,33 +0,0 @@
-package edu.unc.polygon.connector.wordpress;
-
-import org.identityconnectors.framework.common.objects.Attribute;
-import org.identityconnectors.framework.common.objects.Uid;
-import org.identityconnectors.framework.common.objects.filter.AbstractFilterTranslator;
-import org.identityconnectors.framework.common.objects.filter.EqualsFilter;
-
-import java.util.List;
-
-public class WordpressFilterTranslator extends AbstractFilterTranslator<String> {
-
-    @Override
-    protected String createEqualsExpression(EqualsFilter filter, boolean not) {
-        if (not) {
-            return null;
-        }
-
-        Attribute attr = filter.getAttribute();
-        if (!attr.is(Uid.NAME)) {
-            return null;
-        }
-
-        List<Object> values = attr.getValue();
-        if (values.isEmpty()) {
-            return null;
-        }
-
-        Object value = values.get(0);
-
-        return value != null ? value.toString() : null;
-    }
-}
-