Cleanup after architectural review