392.31 some cleanup