declaration cleanup