Removed replaced functions