big feedback cleanup