fixed removing baskets and refactored the gitwrapper code some more