Removed unused class and import