start padding checks, refactor unit removal into utility function