Clean up + Register Definition