Removed all functions that shouldn't be used anylonger