Removed Android trait and related code