Coder cleanup