Removed dead code and mention of albums