clean up
Q changes