COMMON: fix hash, code cleanup
COMMON: remove obsolete code
COMMON: fix hash, code cleanup
COMMON: code cleanup, fix hash