Trivial cleanup
Merge remote-tracking branch 'OVD-vhati/master'