Removed obsolete comments and WM definition