[jabley] trim unused things

That has been moved into the main puppet set up, so not I need fewer
customisations now.