Clean up init code