AH-414 More cleanup and error source found

On to fix it tomorrow