[WIP] clean up

trust me i know that :blush: