Removed everything but viewer