(incomplete) code cleanup