Removal of WFK dependency; removal of quickstart-settings.xml file; minor fixes