Rebound cleanup 2