Several fixes and removed puppet-modules