clean up short limits code