lots of updates, removed stuff we're not using lately.