removed the old unneccesary functions