Clean up
Backwards compatibility updates