removing pointless singleton and sharedTypes