Remove dynamic queries