Cleaned remix (10/23)

Cleaned remix