Remove redundant method and checks