Cleanup
- remove some unneeded code