Client Show Fixes

Removed additional code from merge