Added base classes + cleared all staff