methods cleanup