Rm unused code