Memeber model cleanup