[634] Initial attempt to reduce memory use