big cleanup, update