#60 clean up immutable package