Remove some unneccesary initialization