Introduced compile bug in cleanup