Cleaned up and updated entities based on new SDCC DB.