And remove the method in window that returns it, because it isn't used
so far.