Remove old code, tinker with section 4