Remove really really recursive stuff