Remove api limit, make deprecated function more deprecated