added clean option, plus removed the bin cruft ;)