Remove obsolete views
Update paths