[Anton] Update and cleanup