prefixed all log output
removed some useless code