Update email and remove common.yaml