Removed remaining commented code from Viewer