Removing dead code, and making default query just get everything.