Cleanup (1/2)

Theres more to do