Remove 1.5 functions and DS from category model
Remove 1.5 functions and DS from lib