Removing overridding using statements (now all the dummy query handlers have been replaced with EF query handlers)