Removed deprecated functions, removed views