Ditch some less relevant XXX coments, since the user story has been refactored