Adding clean-up to port rebuild