CLC-4153 - Removed unnecessary commented stubs