removed some unnecessary methods