Removing unused code.
Adding fix for Mara's mafs with NA's