cleanup of the definitions