Main and Staff classes removed