Updated to remove zombie views