Remove code no longer needed