Error handling - Remove old, unsafe functions