Forks of 35. Multiple Views Cleanup