Cleanup of definitions.