got rid of un-neccesary functions