Some last minute cleanup