Removed unused system entities