More cleanup

Need to add back a load model funtion