need to cleanup views