hydra: remove some layout, test

Created by  Rob Vermaas  on March 29, 2010
WTHZ4AGP4LSBUALFRGBYBR7M3HCYTVFLNHMBKQYVLKQOJK4MFV5QC
Change contents