Cleaned Up

- Removed all old commented code.
- Tweaked a few messages