Cleanup + Use cake pattern on database objects.