fs-skeleton: Cleanup