Removed comments and unused data in compose call