removing some no-longer-needed stuff