Removed unused comments.
Added associations to Query.