Improved old window handling, depreciation warning suppression..

Improved old window handling, added depreciation warning suppression and cancelled state detection.