remove logging
add/remove comments