Removed DisdFreedom stuff, changed TFM to CJFM