[PORTER] Removed old code