Cleanup for DPI awareness improvement