Initial tidy up to after first site commit.