Removed mat views stuff