Merge "Cleanup." into graphics-dev