[Anton] Quick cleanup