Removeing unused code