Removed some unnecessary methods.