Cleanup
Commented out lots of never used code
Minor edits