Slight Tweaks

Removed unused code, merged Command and CommandList into on file.