Export class directly
Remove unused variable