Remove dependency to appWindow