Removed extraneous stuff