Corrected jaykul merge of PS2 -> master by removing duplicated using.