CS-4849: Removed commented code