Cleaning this branch for all libraries