fix: removed all classes which are not bounded to container (#297)

fix: removed all classes which are not bounded to container (#297) #910