add body and shape cleanup ^_^