SEE #54 more cleanup