Cleanup to reduce slug size