remove unnecessary query
adding some comments :)