Finished basic contract clean up for now.