Fix : remove unused columns in query
Cosmetics changes