removed some logs, less exception handling