Some cleanup.
Removed the StaticHash check.