Removed MFC

fixes #376
Fixed exception being thrown when it wasnt needed