General cleanup; removing extra logging/comments