clear code; remove useless stuff