Strip code down to minimal components for now (can always get old code back from past commits).