Remove some no use code