Additional cleanup of views