TAMAYA-3:
- Changed Stage back to enum, removed all related artifacts.