Added deprecated classes for bc
Code cleaning