Updated Queries and config files. Removed commented code.