Remove uncessary object and update comment