Bugfixes & old code removal
Clarified comment