Implementation cleanup