did some cleanup for BQ