Clean Up

No build errors, but not running currently