Removed unused code
Updated name