cleanup more code
more code cleanup