removed dependency on common project