paul@jones.lan Source clean up