Remove window and restructuring