Fix @author
Remove unused classes (perhaps useful for next version)