Clenaup data fixtures + bad sample layouts