Remove some unnecessary methods