cleanup

big cleanup