CLEREZZA-930: Improved scalability + clean up