Cleanup
- remove unneeded code