Remove redundant functions and their restrictions