MISC: Changed code to remove unnecessary sections.

Also removed unused imports.