Code cleanup

Remove unnecessary instancing of Show classes