POST 1 Model update - removed unused classes.