remove old limitation