Removed views and the like (for now)