Cleanup of gehoke_common