Remove unneeded files, de-generalize admin query script