cleaning up.
simpler api limiting