Remove all the promiscuous methods, better expose class coupling