removed CM dependencies and media