Removed some extraneous stuff