clean up
updated to work with v1.4