Eluna Clean part of old code off