More clean up and fstab update