Clean-ups and updated last edit year.
Removed dead code. Comment for explicit casting problem.