Removed unused code, Add code to delete