Clean up following merge of feature/like branch.