[WiP] Cleaning up unused stuff