"cleanup" story, needs more cleanup...