doing more cleanup in SPViewController