unnecessary methods removed