Various cleanup, edited models