- Minor fixes and old code removal.