FLOE-171: Removed commented code.