Removed unused modules and updated my enquiries to use the new DB view