removed unnecessary functions