fix/clean up. No new implementation