Removed helpers and model files