Clean up fmap