Merge "Remove dead code in window manager."