Removed mounts, rewirete serve save code