Some cleanup
Updated models