Cleanup to simplify