Removed obselete functions