remove evil, start to clean up init structure