Cleanup
- remove redundant code