finished and made modifications to uses and removeunit