removed unnecessary functionality