Fixed clearing up of new/old board