Removed some compatibility functions