Remove unsafe cleanup routine