Some simple cleanup