Cleaned up imports.
Removed references to collected-data parameter where it's not needed.
Deleted build.number