extended functionality and cleanup of plugin infrastructure
cleanup