Remove uses

Signed-off-by: crynobone <crynobone@gmail.com>
Reorder uses.

Signed-off-by: crynobone <crynobone@gmail.com>
Remove whitespace.

Signed-off-by: crynobone <crynobone@gmail.com>
Update branch alias.

Signed-off-by: crynobone <crynobone@gmail.com>