removed debugging vars