added --strip-none option and cleaned up marker handling