basic cleanup to get live