Removed Unused code