Minor change, unused class removed, unused imports removed.