Use generic views: Less code is better
Deleted some files