Remove unnecessary files and tidy up html (remove nested containers)