stragu mention code cleanup