Removed Unused imports & Bug Fix in when calling usage()