more clean up on old methods