Tidy up of .inc files and various junk