Removed stuff I'm no longer using.