hide even more log, remove unused statements