Removing logs and unused code