maintained: cleanup source