FIX: cleanup directory See merge request !3
Modified code section See merge request !2
Modified hr See merge request !1
