Code update to fix errors.

It seems previous updates to the code never deleted old files from
github. This is causing compilation errors. Fixed.