Fixing bootstrap script.
Removing unused imports.
Adding test package.
Adding "DO NOT REMOVE" notice to imports that must not be touched.