remove unused classes
fixing all appframework unit tests