Clean up old structure