refactor / remove excessive logging