Remove classes
Update BND to include interfaces