Cleanup code, remove unecessary comments.