Clean up Mount-related code