Add symlink for strip too cleanup some logic issues