remove excess code
(#20)