mariusl - post-LIVE cleanup