cleanup, support apt-get only
update puppet script