Removed unussed functions