Cleaning up init