Adding logic to remove Contracts namespace and reference once we're done