Cleanup and docker plugin added