Fix #1: cleanup