Cleaned remix (15/23)

Cleaned remix