Fixed concurrency calls, added clean, removed completely bc dependency