early work
cleanup stuff that was added by mistake