Some cleanup and moving forward