No major changes - just cleaning up unused code