Remove unused code & simplified expression