More cleanup plus offset adjust