Removing previous functions as we are duplicating the same work.