Cleanup

@kiwiupover