Various code tidy ups. Remove ChangeLog