Cleanup for new HomePage