cleanup and latest push