remove suspicious has() and contains() methods
un-export a couple more things