Revert "fix visualization bugs"

This reverts commit e91bc544ee1d66b24007f43eb105f0c22f9f2f28.
revert to fix visualization bugs and clean up some rubbish
clean up