Remove struct buffoonery