Issue#24 cleanup