Removed dependency on common project.