removes decorator classes and interface
code coverage increased
code coverage increased