Update documentation and remove unused class