Fixing up separate branching for trashbot