milestone clean up queries cleaned up and corrected