Removed contructor from most cleaners. Added query as a dependency.
Added field_of_study shortcode.