incrimental changes / cleanup may or may not function