Cleaning up our GI solution