Cleanup of definitions