Remove redundant functionalities