Remove usages of support library