removed more mfc crud