Deleted some unnecessary comments, logs, etc. shouldn't include any functional changes