Cleanup to fix build