Clean up code. Remove memoization of features.