more cleanup of un-needed stuff