Unused Code removed