cleanup some uneeded code