Just cleaning up the code and adding a bit of documentation
Removing out of date collector specifications.