Old methods cleanup