Johannes Neumann structure cleanup