Cleanup dead code
Minor decode fix from merge
Remove stray files