Automatic Optimise of library

Early 2021 clean-up: duplicate(s)