Applied new cleanup profile

Also some other refactoring all over, lol