Remove dependency on support lib