More view cleanup