cleanup unnecessary code, minor updates