Remove old noConflict call