Delete dead classes. Collapse dictionary heirarchy so there's less code.
Plugin updates in pom.