Remove erroneous composer call. Add conditionals for other things