Cleaning stuff up so I can work with it