remove contract references from code, ref: #231