removed unnecessary (duplicate) functions