Merge "Fixed invalid memory read, removed dead code"