fixed 'invalid-name'; removed dead code