Got rid of the shared code