Sush | #1173 | cleaning up