Cleanup up in preparation of release