Some cleanups, tested on 4 ch