CLean up old code. Add new implementation to catalog