Cleanup (2/2)

Theres more to do