Cleanup

- Removed code I commented out