Removed stuff we're not using right now.