Remove show/hide and use existing approach