Remove unused classes
Fix Backstage bug