Cleanup, should be backwards compatible