#1: Clean things up