Marefile cleanup