A bit more simple cleanup