Can we make sure we file a bug on cleaning up all of this code? You can add it to me.