Cleanup, forgot to remove in #666