Issue #3443208 by smustgrave, andypost: Remove any missed deprecation code in modules and lib folders