Remove unused property on-stage
Add stubs for todo components