REMOVE_WINDOW added