Quality cleanup
Merge pull request #5112 from edx/sarina/quality-clean

Quality cleanup