ERT-601: Removed commented out code.