remove initial query template implementation