major cleanup of views