Remove old view
Clean up