Further cleanup section 1