Cleanup code that will go into different repos