Remove more redundant functions