Removed stuff that isn't being used.