starting some simple cleanup