Further cleaning and gcp edits