Clean up for QPR2

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
74 files changed