Removed non-composer support