Inline cleanup