FLOE-204: removed commented out code