code cleanup: better wicked integration, removed obsolete code