Removed checks and removed a couple of comments.