Remove superfluous comments and logging