less log
some cleanup