Cleanup of Feed and extending classes