Cleaned up in old view type