removing unneeded sections, renaming