Cleanup models and helpers: remove commented-out and no-longer-used code