Removing appendage of old data model
Adding additional milestone just in case