Removed depreciated portions of the model