Removed one each of the Gather/Deposit classes because they are redundant. Did some other stuff, can't remember what.