cleanup of pop optimization + non-optimizad TVD&FE for position