removed unused contracts, code cleanup;