Updated dependeces and remove twb2 modules