more clenup

more clenup