Master cleaning
UPDATED: qualifiers 1.4 > 1.5