Plan/DB: Cleaned up.