cleanup of debug and unused modules