Removes dependency on evan framework