Revert "cleanup"
Revert "cleanup"

This reverts commit 4103e8b0772b2f6dc9ccb24bc70b707f8a52463a.

alexjlockwood/ShapeShifter,Sagi363/ShapeShifter,Sagi363/ShapeShifter,alexjlockwood/ShapeShifter,alexjlockwood/ShapeShifter,alexjlockwood/ShapeShifter,Sagi363/ShapeShifter