General fixes, removed logging
General fixes