Removed views and tests