Clean up a few labels/placeholders for @whale