Removed optimization commands, changed example queries to tested ones