Album model cleanup