got rid of unncecesary funciton