remove unused class, minor tidy up