Cleanup in between third and fourth commit